Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SUS Bathroom 3.5 #41

Merged
merged 638 commits into from
Jan 27, 2020
Merged

Conversation

xanderrootslayer
Copy link
Owner

Summary

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

Additional context

jbytheway and others added 30 commits January 17, 2020 08:29
* Link to CONTRIBUTING.md from doc folder

The CONTRIBUTING.md is hidden inside .github, because that's where it
needs to be for GitHub to find it.  But it contains useful information
people might look for in the docs too, so symlink it from the doc
directory.

* Update CONTRIBUTING.md

Update a few aspects of this file which had become out of date.

Link to the DEVELOPER_FAQ.md from the FAQ section at the end.

* Move GUIDE_COMESTIBLES.md into doc

Not sure how it was ever in the top-level directory.
* update 2 additional house sets

* fix wall terrain
Code optimizations reported by static code analysis (2020-01-14)
* Mark all armors that need repairs_like id
Attempted to match items with same slot item with same material.
Explosive power should be in grams of tnt equivalent.
* Refactored `closest_(tri)points_first` functions
- moved into `point` file;
- rearranged function parameters;
- removed duplicate code;
- get rid of some `auto` and one time use variables;
Remove Brian-Cataclysm-DDA - Shortcut.lnk
* fix global/local destination
ZhilkinSerg and others added 29 commits January 26, 2020 01:19
Update Makefile so LTO works on OSX
* Description, recipe, parent, itemidswap, and capitalization fixes
removed redundant hotplate pseudoitem
* Buffed mundane item weights

* Increased loot amount tenfold

* Increased recycle bin storage capacity

* Update data/json/itemgroups/locations.json

Co-Authored-By: I-am-Erk <[email protected]>

* Added some more items and fixed wrong ones

Co-authored-by: I-am-Erk <[email protected]>
* Added Special 700 to guns_rifle_improvised

* Reverted the item group addition

* Replaced the gun with a Reminton 700 in mapgen files

* Obsoleted the gun
Integer times in construction.json were converted directly to minutes
(confirmed in-game that these are the correct construction times).

Integer times in some ammo and vehicle recipes were converted such that
100 is 1 turn, and since 1 turn is 1 second, this means "time: 4000" is
a duration of 40 seconds, and "time: 30000" is a duration of 5 minutes.
Again I checked in-game for these recipes to be sure of my
interpretation (despite a few of these seeming unrealistically quick,
such as the 5-second boat oars).

Partial fix for #36110
created 3 new .jsons -- locations_mapextras, agriculture and gear_civilian. Moved spawn lists from item_groups and gear.jsons into various lists.
Refresh whole screen after selecting "What to do with your X" query
* Pull out string consts from tons of files

* Rollback large files

* Rollback

* Rollback

* Rollback

* FIx test/typo

* Astyle
Removed redundant hotplate on onboard chemistry lab
…proper uncrafting + other tweaks Fixes #37291 (#37373)

* Modernize craft times

Craft times were still in 100 moves per 6 seconds era.

* Add id_suffix "from_scrap" to manhack recipes, remove inactive manhack from scrap recipe, modern time

Adding Id suffix should enable one to craft manhacks from the whole components or rebuild them from scrap components and damaged manhacks. This should allow inactive manhacks to be dismantled again fixing CleverRaven:#37291 

Removed inactive manhack from "from_scrap" entries.

* Added from scratch recipes and changed suffix ids

Changed suffix ids to "repair" on repair recipes to manage ambiguity.

Added base recipes that match the recipes for CROWS II turret sans weapon with additional programming and mechanical expertise and difficulty being the separation between the manufacture types, implying the user has to train or program the AI core to operate the weapon. Repair recipes require electrohack to repair, the majority of the time spent hacking the broken AI core into its original function. The from-scratch recipes added imply the builder is working from a reset AI core that is is in working order and will easily accept programming instructions and the additional 10 minutes added is for completely building the turret from parts.
The resistances constructor for monsters left the DT_ELECTRIC value
uninitialized.  This led to inconsistent behaviour and CI test failures.

Ensure it's initialized.
Adds extra whitespace to fix tests fail
Replace Food and Drink labels with Hunger and Thirst
@xanderrootslayer xanderrootslayer merged commit 13ef100 into xanderrootslayer:master Jan 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.